Skip to content

Commit 69c61ee

Browse files
hlavananthlavanant
committed
Merge branch 'release/2.11.0'
2 parents c6d09a7 + 28ef29b commit 69c61ee

File tree

20 files changed

+230
-8
lines changed

20 files changed

+230
-8
lines changed

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ stages:
2727
tags:
2828
- docker20
2929
before_script:
30-
- curl -sSL https://install.python-poetry.org | python -
30+
- curl -sSL https://install.python-poetry.org | python - --version 1.8.4
3131
- export PATH="/root/.local/bin:$PATH"
3232
- poetry install --no-root --with dev
3333

‎.gitlab/issue_templates/Bug.md‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
## Subject
2+
_Description of the bug_
3+
4+
## Steps to reproduce
5+
- Action 1
6+
- Action 2
7+
- ...
8+
9+
## Actual results
10+
_What actually happens_
11+
12+
## Expected results
13+
_What you should see instead_
14+
15+
## Technical solution
16+
_Write technical solution if identified_
17+
18+
## Security and Privacy
19+
> Risk level MUST be systematically assessed before designing a change. Actions to handle risk and approval depend on the risk level:
20+
>- None/low: no or low impact and probability considered. If the risk is considered low, actions to handle the risk may be defined. No approval required.
21+
>- Medium: either significant impact or significant probability considered. Actions must be defined in the sections below and approved/completed by a team lead before implementing the change.
22+
>- High: significant impact AND probability considered. Actions must be defined in the section below and approved/completed by CTO or CISO before implementing the change.
23+
24+
| Risk level | None | Low | Med. | High |
25+
|------------|----------|----------|--------|-----------------------|
26+
| Rating | | | | :heavy_check_mark: |
27+
28+
### Actions to handle risk
29+
_to be filled by actions of any kind if level >= low_
30+
31+
## Personal data
32+
_Anything concerning user personal data that should be discussed with legal team_
33+
34+
> This section should **always** be updated. In case there is nothing to say, simply add "nothing relevant" or "nothing identified"
35+
36+
## Tests
37+
_In addition to the classic unit and functional tests, additional tests that should be performed either automatic or manual_
38+
39+
> This section should **always** be updated. In case there is nothing to say, simply add "nothing relevant" or "nothing identified"
40+
41+
## Impacts
42+
_List of impacted routes or functionality_
43+
44+
## DoD
45+
_In front of each item write one of those: N/A, Done, link to wiki/infra issue, or the modification made_
46+
47+
| Item | |
48+
|-----------------------------------------------|:---:|
49+
| Feature tested locally | |
50+
| Merge request created from feature to develop | |
51+
52+
/label ~Bug

‎.gitlab/issue_templates/Feature.md‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
## Description
2+
_Description of the feature_
3+
4+
## Functional solution
5+
_Add task list of functionality to implement_
6+
- [ ] functionality 1
7+
- [ ] functionality 2
8+
9+
## Technical solution
10+
_Add task list of relevant technical modification_
11+
- [ ] modification 1
12+
- [ ] modification 2
13+
14+
## Security and Privacy
15+
> Risk level MUST be systematically assessed before designing a change. Actions to handle risk and approval depend on the risk level:
16+
>- None/low: no or low impact and probability considered. If the risk is considered low, actions to handle the risk may be defined. No approval required.
17+
>- Medium: either significant impact or significant probability considered. Actions must be defined in the sections below and approved/completed by a team lead before implementing the change.
18+
>- High: significant impact AND probability considered. Actions must be defined in the section below and approved/completed by CTO or CISO before implementing the change.
19+
20+
| Risk level | None | Low | Med. | High |
21+
|------------|----------|----------|--------|-----------------------|
22+
| Rating | | | | :heavy_check_mark: |
23+
24+
### Actions to handle risk
25+
_to be filled by actions of any kind if level >= low_
26+
27+
## Personal data
28+
_Anything concerning user personal data that should be discussed with legal team_
29+
30+
> This section should **always** be updated. In case there is nothing to say, simply add "nothing relevant" or "nothing identified"
31+
32+
## Tests
33+
_In addition to the classic unit and functional tests, additional tests that should be performed either automatic or manual_
34+
35+
> This section should **always** be updated. In case there is nothing to say, simply add "nothing relevant" or "nothing identified"
36+
37+
## Impacts
38+
_List of impacted routes or functionality_
39+
40+
## Estimation
41+
x jH
42+
43+
## Questions
44+
- Question
45+
> answer
46+
47+
## DoD
48+
_In front of each item write one of those: N/A, Done, link to infra issue, or the modification made_
49+
50+
| Item | |
51+
|-------------------------------------------------------------------------------------------------------------------------------------------|:---:|
52+
| New environment variables added in settings files and issue created in [infra board](https://git.clacos.ninja/infra/infradev/-/boards) | |
53+
| New command and consumer described in [Readme.md]() and issue created in [infra board](https://git.clacos.ninja/infra/infradev/-/boards) | |
54+
| Feature tested locally | |
55+
| Merge request created from feature to develop | |
56+
57+
58+
/label ~Feature

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM python:3.12.1-slim-bookworm AS builder
22
RUN apt-get update && apt-get install -yq curl
3-
RUN curl -sSL https://install.python-poetry.org | python -
3+
RUN curl -sSL https://install.python-poetry.org | python - --version 1.8.4
44
WORKDIR /ywh2bt
55
COPY / ./
66
RUN /root/.local/bin/poetry build

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Since data is pulled from YWH platform to your server, only regular outbound web
4949

5050
## Changelog
5151

52+
- v2.11:
53+
- added support for new impact and cve fields
5254
- v2.10:
5355
- added support for new ask for fix process
5456
- added support for report transfer log

‎poetry.lock‎

Lines changed: 4 additions & 4 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "ywh2bt"
3-
version = "2.10.0"
3+
version = "2.11.0"
44
description = "ywh2bt - YesWeHack to Bug Tracker"
55
readme = "README.md"
66
authors = ["m.honel <m.honel@yeswehack.com>"]
@@ -68,7 +68,7 @@ frozenlist = [
6868
{ version="^1.3.0", python = "<3.8" },
6969
{ version="^1.4.0", python = ">=3.8" },
7070
]
71-
yeswehack = ">=0.8.7"
71+
yeswehack = ">=0.8.8"
7272

7373
[tool.poetry.extras]
7474
gui = ["pyside6"]

‎stubs/yeswehack/api.pyi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ class Report:
170170
tracking_status: str
171171
vulnerable_part: str
172172
ask_for_fix_verification_status: str
173+
cve: Dict[str, Any]
174+
impact: str
173175

174176
def __init__(
175177
self,

‎ywh2bt/core/api/formatter/formatter.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ def format_report_description(
167167
bug_type_name=report.bug_type.name,
168168
bug_type_link=report.bug_type.link,
169169
bug_type_remediation_link=report.bug_type.remediation_link or "/",
170+
cve_label=self._get_property_label("cve"),
171+
cve_name=report.cve.get("id") or "",
172+
impact_label=self._get_property_label("impact"),
173+
impact_name=report.impact or "",
170174
scope_label=self._get_property_label("scope"),
171175
scope=self._transform_value(
172176
value=report.scope,

‎ywh2bt/core/api/formatter/markdown.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
|-------|---------------------|
1414
| Priority | ${priority_name} |
1515
| ${bug_type_label} | [${bug_type_name}](${bug_type_link}) &#8594; [Remediation](${bug_type_remediation_link}) |
16+
| ${cve_label} | ${cve_name} |
17+
| ${impact_label} | ${impact_name} |
1618
| ${scope_label} | ${scope} |
1719
| Severity | ${cvss_criticity}, score: ${cvss_score}, vector: ${cvss_vector} |
1820
| ${end_point_label} | ${end_point} |

0 commit comments

Comments
 (0)