Skip to content

Commit 0fa3d71

Browse files
author
Diego Nadares
committed
Merge branch 'white/staging' into white/master
2 parents 7ac1651 + 0dba256 commit 0fa3d71

File tree

21 files changed

+208
-134
lines changed

21 files changed

+208
-134
lines changed

‎.gitlab/ci/build-ci/.build-gitlab-ci.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ generate_deb_dev:
2121
- git checkout d7b466787d17581bc723e474ecf6e18f48226031
2222
- git apply ../fpm-patchs/fpm.virtualenv.patch
2323
- make gem
24-
- gem install --no-ri --no-rdoc dotenv -v 2.7
25-
- gem install --no-ri --no-rdoc public_suffix -v 4.0.7
26-
- gem install --no-ri --no-rdoc fpm-1.11.0.gem
24+
- gem install --no-document dotenv -v 2.7
25+
- gem install --no-document public_suffix -v 4.0.7
26+
- gem install --no-document fpm-1.11.0.gem
2727
- cd ../../
2828
- POSTFIX=$(echo "$CI_COMMIT_BRANCH" | awk '{split($1,a,"_");split($1,b,"/"); if (a[3]!="y2k") if (b[2]=="dev"||b[2]=="master") print ""; else print "~"a[3]; else exit 1;}')
2929
- sh faraday-linux-installers-builder/build.sh $(eval $IMAGE_TAG)~$((`date '+%s%N'`/1000))$POSTFIX server deb
@@ -68,9 +68,9 @@ generate_deb_staging:
6868
- git checkout d7b466787d17581bc723e474ecf6e18f48226031
6969
- git apply ../fpm-patchs/fpm.virtualenv.patch
7070
- make gem
71-
- gem install --no-ri --no-rdoc dotenv -v 2.7
72-
- gem install --no-ri --no-rdoc public_suffix -v 4.0.7
73-
- gem install --no-ri --no-rdoc fpm-1.11.0.gem
71+
- gem install --no-document dotenv -v 2.7
72+
- gem install --no-document public_suffix -v 4.0.7
73+
- gem install --no-document fpm-1.11.0.gem
7474
- cd ../../
7575
- POSTFIX=$(echo "$CI_COMMIT_BRANCH" | awk '{split($1,a,"_");split($1,b,"/"); if (a[3]!="y2k") if (b[2]=="dev"||b[2]=="master") print ""; else print "~"a[3]; else exit 1;}')
7676
- sh faraday-linux-installers-builder/build.sh $(eval $IMAGE_TAG)~$((`date '+%s%N'`/1000))$POSTFIX server deb
@@ -112,9 +112,9 @@ generate_deb_master:
112112
- git checkout d7b466787d17581bc723e474ecf6e18f48226031
113113
- git apply ../fpm-patchs/fpm.virtualenv.patch
114114
- make gem
115-
- gem install --no-ri --no-rdoc dotenv -v 2.7
116-
- gem install --no-ri --no-rdoc public_suffix -v 4.0.7
117-
- gem install --no-ri --no-rdoc fpm-1.11.0.gem
115+
- gem install --no-document dotenv -v 2.7
116+
- gem install --no-document public_suffix -v 4.0.7
117+
- gem install --no-document fpm-1.11.0.gem
118118
- cd ../../
119119
- POSTFIX=$(echo "$CI_COMMIT_BRANCH" | awk '{split($1,a,"_");split($1,b,"/"); if (a[3]!="y2k") if (b[2]=="dev"||b[2]=="master") print ""; else print "~"a[3]; else exit 1;}')
120120
- sh faraday-linux-installers-builder/build.sh $(eval $IMAGE_TAG)~$((`date '+%s%N'`/1000))$POSTFIX server deb
@@ -145,9 +145,9 @@ generate_rpm_dev:
145145
- cd /; tar xf py3.tar; cd -
146146
- yum -y install curl zsh mailcap libffi-devel openssl-devel openldap-devel libjpeg-devel postgresql-devel
147147
- yum groups -y install "Development Tools"
148-
- yum -y install rh-python36 rh-ruby23 rh-ruby23-ruby-devel
149-
- source /opt/rh/rh-ruby23/enable
150-
- export X_SCLS="`scl enable rh-ruby23 'echo $X_SCLS'`"
148+
- yum -y install rh-python36 rh-ruby26 rh-ruby26-ruby-devel
149+
- source /opt/rh/rh-ruby26/enable
150+
- export X_SCLS="`scl enable rh-ruby26 'echo $X_SCLS'`"
151151
- source /opt/rh/rh-python36/enable
152152
- pip install virtualenv
153153
- pip install virtualenv-tools3
@@ -166,9 +166,9 @@ generate_rpm_dev:
166166
- git checkout d7b466787d17581bc723e474ecf6e18f48226031
167167
- git apply ../fpm-patchs/fpm.virtualenv.patch
168168
- make gem
169-
- gem install --no-ri --no-rdoc dotenv -v 2.7
170-
- gem install --no-ri --no-rdoc public_suffix -v 4.0.7
171-
- gem install --no-ri --no-rdoc fpm-1.11.0.gem
169+
- gem install --no-document dotenv -v 2.7
170+
- gem install --no-document public_suffix -v 4.0.7
171+
- gem install --no-document fpm-1.11.0.gem
172172
- cd ../../
173173
- sh faraday-linux-installers-builder/build.sh $(eval $IMAGE_TAG) server rpm
174174
- mv faraday-server_amd64.rpm ../../faraday-server_amd64.rpm
@@ -200,9 +200,9 @@ generate_rpm_staging:
200200
- cd /; tar xf py3.tar; cd -
201201
- yum -y install curl zsh mailcap libffi-devel openssl-devel openldap-devel libjpeg-devel postgresql-devel
202202
- yum groups -y install "Development Tools"
203-
- yum -y install rh-python36 rh-ruby23 rh-ruby23-ruby-devel
204-
- source /opt/rh/rh-ruby23/enable
205-
- export X_SCLS="`scl enable rh-ruby23 'echo $X_SCLS'`"
203+
- yum -y install rh-python36 rh-ruby26 rh-ruby26-ruby-devel
204+
- source /opt/rh/rh-ruby26/enable
205+
- export X_SCLS="`scl enable rh-ruby26 'echo $X_SCLS'`"
206206
- source /opt/rh/rh-python36/enable
207207
- pip install virtualenv
208208
- pip install virtualenv-tools3
@@ -221,9 +221,9 @@ generate_rpm_staging:
221221
- git checkout d7b466787d17581bc723e474ecf6e18f48226031
222222
- git apply ../fpm-patchs/fpm.virtualenv.patch
223223
- make gem
224-
- gem install --no-ri --no-rdoc dotenv -v 2.7
225-
- gem install --no-ri --no-rdoc public_suffix -v 4.0.7
226-
- gem install --no-ri --no-rdoc fpm-1.11.0.gem
224+
- gem install --no-document dotenv -v 2.7
225+
- gem install --no-document public_suffix -v 4.0.7
226+
- gem install --no-document fpm-1.11.0.gem
227227
- cd ../../
228228
- sh faraday-linux-installers-builder/build.sh $(eval $IMAGE_TAG) server rpm
229229
- mv faraday-server_amd64.rpm ../../faraday-server_amd64.rpm
@@ -252,9 +252,9 @@ generate_rpm_master:
252252
- cd /; tar xf py3.tar; cd -
253253
- yum -y install curl zsh mailcap libffi-devel openssl-devel openldap-devel libjpeg-devel postgresql-devel
254254
- yum groups -y install "Development Tools"
255-
- yum -y install rh-python36 rh-ruby23 rh-ruby23-ruby-devel
256-
- source /opt/rh/rh-ruby23/enable
257-
- export X_SCLS="`scl enable rh-ruby23 'echo $X_SCLS'`"
255+
- yum -y install rh-python36 rh-ruby26 rh-ruby26-ruby-devel
256+
- source /opt/rh/rh-ruby26/enable
257+
- export X_SCLS="`scl enable rh-ruby26 'echo $X_SCLS'`"
258258
- source /opt/rh/rh-python36/enable
259259
- pip install virtualenv
260260
- pip install virtualenv-tools3
@@ -273,9 +273,9 @@ generate_rpm_master:
273273
- git checkout d7b466787d17581bc723e474ecf6e18f48226031
274274
- git apply ../fpm-patchs/fpm.virtualenv.patch
275275
- make gem
276-
- gem install --no-ri --no-rdoc dotenv -v 2.7
277-
- gem install --no-ri --no-rdoc public_suffix -v 4.0.7
278-
- gem install --no-ri --no-rdoc fpm-1.11.0.gem
276+
- gem install --no-document dotenv -v 2.7
277+
- gem install --no-document public_suffix -v 4.0.7
278+
- gem install --no-document fpm-1.11.0.gem
279279
- cd ../../
280280
- sh faraday-linux-installers-builder/build.sh $(eval $IMAGE_TAG) server rpm
281281
- mv faraday-server_amd64.rpm ../../faraday-server_amd64.rpm

‎.gitlab/ci/publish/.mirror-to-github-gitlab-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
update_github:
7-
image: python:3
7+
image: python:3.11
88
stage: publish
99
script:
1010
- !reference [.set-remote-github, script]
@@ -34,7 +34,7 @@ update_github:
3434

3535

3636
tag_on_github:
37-
image: python:3
37+
image: python:3.11
3838
stage: publish
3939
script:
4040
- !reference [.set-remote-github, script]
@@ -58,7 +58,7 @@ tag_on_github:
5858
artifacts: true
5959

6060
upload_assets_to_github_tag:
61-
image: python:3
61+
image: python:3.11
6262
stage: publish
6363
script:
6464
- export FARADAY_VERSION=$(eval $IMAGE_TAG)

‎.gitlab/ci/publish/.set-tag-gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
publish_pypi:
2-
image: python:3
2+
image: python:3.11
33
stage: publish
44
script:
55
- !reference [ .get_from_tar_and_replace_www, script ]

‎.gitlab/ci/testing/.pretesting-gitlab-ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
merge_conflict_check:
22
tags:
33
- faradaytests
4-
image: python:3
4+
image: python:3.11
55
stage: pre_testing
66
allow_failure: true
77
script:
@@ -16,7 +16,7 @@ merge_conflict_check:
1616
sanity_check:
1717
tags:
1818
- faradaytests
19-
image: python:3
19+
image: python:3.11
2020
stage: pre_testing
2121
script:
2222
- bash scripts/sanity_check_commit.sh
@@ -29,7 +29,7 @@ sanity_check:
2929
migration_sanity_check:
3030
tags:
3131
- faradaytests
32-
image: python:3
32+
image: python:3.11
3333
stage: pre_testing
3434
script:
3535
- scripts/model_check.py
@@ -44,7 +44,7 @@ migration_sanity_check:
4444
bandit:
4545
tags:
4646
- faradaytests
47-
image: python:3
47+
image: python:3.11
4848
stage: pre_testing
4949
script:
5050
- pip3 install virtualenv
@@ -92,7 +92,7 @@ build_and_push_to_cachix:
9292
- when: on_success
9393

9494
flake8:
95-
image: python:3
95+
image: python:3.11
9696
stage: pre_testing
9797
script:
9898
- pip install flake8
@@ -102,7 +102,7 @@ flake8:
102102
- when: on_success
103103

104104
no-format-str:
105-
image: python:3
105+
image: python:3.11
106106
stage: pre_testing
107107
script:
108108
- pip install flynt==0.69

‎CHANGELOG/4.6.1/community.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
* [MOD] Optimize hosts API when stats aren't needed. #7596
2+
* [ADD] New `exclude_stats` query param in workspace endpoint. #7595
3+
* [FIX] Filter .webp files in vulns attachment endpoint because CVE-2023-4863. #7603

‎CHANGELOG/4.6.1/date.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Oct 19th, 2023

‎CHANGELOG/4.6.2/community.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* [ADD] Exclude unnecessary fields from VulnerabilitySchema in filter endpoint. #7608

‎CHANGELOG/4.6.2/date.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Nov 10th, 2023

‎RELEASE.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
New features in the latest update
22
=====================================
33

4+
4.6.2 [Nov 10th, 2023]:
5+
---
6+
* [ADD] Exclude unnecessary fields from VulnerabilitySchema in filter endpoint. #7608
7+
8+
4.6.1 [Oct 19th, 2023]:
9+
---
10+
* [ADD] New `exclude_stats` query param in workspace endpoint. #7595
11+
* [MOD] Optimize hosts API when stats aren't needed. #7596
12+
* [FIX] Filter .webp files in vulns attachment endpoint because CVE-2023-4863. #7603
13+
414
4.6.0 [Sep 6th, 2023]:
515
---
616
* [FIX] Delete Cascade from KB. #7569

‎faraday/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
See the file 'doc/LICENSE' for the license information
55
"""
66

7-
__version__ = '4.6.0'
7+
__version__ = '4.6.2'
88
__license_version__ = __version__

0 commit comments

Comments
 (0)