Skip to content

Commit 9dd2130

Browse files
author
Matthieu Honel
committed
Merge branch 'release/2.7.5'
2 parents 3da2161 + df7ee66 commit 9dd2130

11 files changed

Lines changed: 1054 additions & 1034 deletions

File tree

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ max-import-from-members = 15
1010
max-name-length = 75
1111
max-module-members = 30
1212
max-methods = 40
13-
max-arguments = 10
13+
max-arguments = 12
1414
max-attributes = 10
1515
max-local-variables = 15
1616
max-raises = 5

docs/User-Guide.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ that can be downloaded from the [Yes We Hack platform][YesWeHack-Platform].
274274
- **Program slug**: a program slug.
275275
- **Synchronization options**: options for synchronizing a Yes We Hack report with the bug tracker.
276276
- **Upload private comments**: whether to upload the reports private comments into the bug tracker.
277+
- **Upload assignments comments**: whether to upload the reports assignments comments into the bug tracker.
277278
- **Upload public comments**: whether to upload the reports public comments into the bug tracker.
278279
- **Upload CVSS updates**: whether to upload the reports CVSS updates into the bug tracker.
279280
- **Upload details updates**: whether to upload the reports details updates into the bug tracker.

docs/img/ui-yeswehack-empty.png

10.5 KB
Loading
3.29 KB
Loading

docs/user-guide/User-Guide.html

Lines changed: 4 additions & 3 deletions
Large diffs are not rendered by default.

docs/user-guide/User-Guide.pdf

9.7 KB
Binary file not shown.

poetry.lock

Lines changed: 1026 additions & 1027 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "ywh2bt"
3-
version = "2.7.4"
3+
version = "2.7.5"
44
description = "ywh2bt - YesWeHack to Bug Tracker"
55
readme = "README.md"
66
authors = ["m.honel <m.honel@yeswehack.com>"]
@@ -47,6 +47,7 @@ types-requests = "*"
4747
types-setuptools = "*"
4848
tomlkit = "^0.7.0"
4949
yeswehack = ">=0.7.2,<1"
50+
urllib3 = "<=1.26.15"
5051

5152
[tool.poetry.dev-dependencies]
5253
mypy = "*"

ywh2bt/core/api/mapping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ def map_raw_log( # noqa: WPS210,WPS212,WPS231
295295
old_status=raw_log.old_status,
296296
new_status=raw_log.status,
297297
)
298-
if raw_log.type == 'comment':
298+
if raw_log.type == 'comment' or (raw_log.type == 'assign' and message_html):
299299
return CommentLog(
300300
created_at=created_at,
301301
log_id=log_id,

ywh2bt/core/configuration/yeswehack.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ class SynchronizeOptions(AttributesContainer):
4848
description='Upload the report private comments into the bug tracker',
4949
default=False,
5050
)
51+
upload_assign_comments: BoolAttributeType = Attribute.create(
52+
value_type=bool,
53+
short_description='Upload assignments comments',
54+
description='Upload the comments of assignments into the bug tracker',
55+
default=False,
56+
)
5157
upload_public_comments: BoolAttributeType = Attribute.create(
5258
value_type=bool,
5359
short_description='Upload public comments',
@@ -98,6 +104,7 @@ def __init__(
98104
self,
99105
upload_private_comments: Optional[bool] = None,
100106
upload_public_comments: Optional[bool] = None,
107+
upload_assign_comments: Optional[bool] = None,
101108
upload_details_updates: Optional[bool] = None,
102109
upload_cvss_updates: Optional[bool] = None,
103110
upload_priority_updates: Optional[bool] = None,
@@ -111,6 +118,7 @@ def __init__(
111118
112119
Args:
113120
upload_private_comments: a flag indicating whether to upload private comments to the bug tracker
121+
upload_assign_comments: a flag indicating whether to upload assign comments to the bug tracker
114122
upload_public_comments: a flag indicating whether to upload public comments to the bug tracker
115123
upload_cvss_updates: a flag indicating whether to upload CVSS updates to the bug tracker
116124
upload_details_updates: a flag indicating whether to upload details updates to the bug tracker
@@ -122,6 +130,7 @@ def __init__(
122130
"""
123131
super().__init__(**kwargs)
124132
self.upload_private_comments = upload_private_comments
133+
self.upload_assign_comments = upload_assign_comments
125134
self.upload_public_comments = upload_public_comments
126135
self.upload_cvss_updates = upload_cvss_updates
127136
self.upload_details_updates = upload_details_updates

0 commit comments

Comments
 (0)