Feature/zcs 11179 by SuryawanshiAmol · Pull Request #5 · Zimbra/nginx

SuryawanshiAmol · 2023-08-10T14:40:53Z

The core, event, and http directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

…inx repository and merge them with the Zimbra files. - The core, event, and http directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

- update version

…inx repository and merge them with the Zimbra files. - The auto directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

…inx repository and merge them with the Zimbra files. - The conf directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

… nginx repository and merge them with the Zimbra files. - The contrib directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

…inx repository and merge them with the Zimbra files. - The docs directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

…inx repository and merge them with the Zimbra files. - The misc directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

…lic nginx repository and merge them with the Zimbra files. - The src/stream directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

…nginx repository and merge them with the Zimbra files. - The src/os directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

…inx repository and merge them with the Zimbra files. - src/mail/ngx_mail_smtp_module.c has been merged from branches/stable 1.24 to the current zimbra/nginx.

…ginx repository and merge them with the Zimbra files. - src/mail/ngx_mail_proxy_module.c has been merged from branches/stable 1.24 to the current zimbra/nginx. The following commits from upstream have been skipped as our implementation is different at these points: - nginx@d96d60d#diff-e9062f9616b15ece5fadfd80a39969f44b8db5a8712900d67392b51e66c7e2b1 - nginx@d96d60d#diff-e9062f9616b15ece5fadfd80a39969f44b8db5a8712900d67392b51e66c7e2b1 - nginx@2ca4355

…odule.h

…inx repository and merge them with the Zimbra files. - src/mail/ngx_mail_pop3_module.c has been merged from branches/stable 1.24 to the current zimbra/nginx.

…ectory. - Review comments are discussed with barry and applied them

…ginx repository. - Merged the files with latest nginx version stable-1.24.0

- Remaining file

ZCOMT-2579: Discuss the review comment and apply it to the "core" dir…

- Some review changes

- Fixed compilation errors

- AMB : Code is commented in order to move compilation forward and detect any errors that arise. See https://trac.nginx.org/nginx/ticket/2312

ghen2 · 2023-09-19T07:36:52Z

Btw minor build warning:
./auto/configure: warning: the "--with-ipv6" option is deprecated
(since nginx 1.11.5)

- Removed the whitespaces

fix code comment start->end

ghost · 2023-10-02T14:07:22Z

When comparing our changes from the 1.20 version next to our changes in the 1.24 version, it seems like we omit some of our customizations in ngx_mail_parse.c beginning under /* IMAP tag */ we used to add case '\x0' but we do not anymore. Can you explain why we make a different approach now?

SuryawanshiAmol · 2023-10-06T14:30:23Z

When comparing our changes from the 1.20 version next to our changes in the 1.24 version, it seems like we omit some of our customizations in ngx_mail_parse.c beginning under /* IMAP tag */ we used to add case '\x0' but we do not anymore. Can you explain why we make a different approach now?
Answer: I've left it out because it's now handled in the default case. See the code below the '\x0' will satisfy the if condition.
u_char ch('\x0');
if ((ch < 'A' || ch > 'Z') && (ch < 'a' || ch > 'z')
&& (ch < '0' || ch > '9') && ch != '-' && ch != '.'
&& ch != '_')
{
cout << "goto Invalid";
}

Or we can handle it as below:
case CR:
case LF:
case '\x0':
goto invalid;

SuryawanshiAmol · 2023-10-06T14:42:22Z

The --with-ipv6 option no longer needed. But no harm keeping it. Its not added recently its their since beginning.
Please See:
https://nginx.org/en/CHANGES-1.20

Changes with nginx 1.11.5 11 Oct 2016

*) Change: the --with-ipv6 configure option was removed, **now IPv6
   support is configured automatically.**

- Updated as a part of code review

ghost · 2023-10-09T12:38:19Z

In ngx_mail_parse.c the \x0 is also missing swi_spaces_before_command method. If that is fixed, the rest of the customization in this file look the same as in the 1.20 version.

- Updated as a part of code review

src/event/ngx_event_openssl.c

src/mail/ngx_mail_parse.c

auto/configure

auto/options

- Updated as a part of code review

ghen2 · 2023-10-14T08:59:54Z

Hi

Could you consider including nginx@6ceef19 to mitigate CVE-2023-44487: HTTP/2 Rapid Reset Attack? This patch will be part of an upcoming nginx 1.24.x release.

It applies cleanly to nginx 1.20.0 as well.

ghen2 · 2023-10-23T17:58:07Z

I created PR #7 for Zimbra's nginx 1.20.0, we're already running with this patch in production.

SuryawanshiAmol added 2 commits August 10, 2023 19:54

ZCOMT-2570 : Examine the files in the core directory of the public ng…

2651a49

…inx repository and merge them with the Zimbra files. - The core, event, and http directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2570 : Examine the files in the core directory of the public nginx

13df14c

- update version

SuryawanshiAmol requested review from a user, gautamdg, mahesh-amarelia and shrutig0510 August 10, 2023 14:42

Barry de Graaff and others added 20 commits August 22, 2023 08:20

ZCOMT-2570 : Examine the files in the auto directory of the public ng…

677676b

…inx repository and merge them with the Zimbra files. - The auto directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2570 : Examine the files in the conf directory of the public ng…

c47e8bf

…inx repository and merge them with the Zimbra files. - The conf directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2570 : Examine the files in the contrib directory of the public…

ab561a7

… nginx repository and merge them with the Zimbra files. - The contrib directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2570 : Examine the files in the docs directory of the public ng…

b29c9ec

…inx repository and merge them with the Zimbra files. - The docs directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2570 : Examine the files in the misc directory of the public ng…

db03fe7

…inx repository and merge them with the Zimbra files. - The misc directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2570 : Examine the files in the src/stream directory of the pub…

6684eb8

…lic nginx repository and merge them with the Zimbra files. - The src/stream directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2570 : Examine the files in the src/os directory of the public …

54bcab0

…nginx repository and merge them with the Zimbra files. - The src/os directory code has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2570 : Examine src/mail/ngx_mail_smtp_module.c of the public ng…

6c7fa33

…inx repository and merge them with the Zimbra files. - src/mail/ngx_mail_smtp_module.c has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2570 : adding customization headers to src/mail/ngx_mail_pop3_m…

2c64d98

…odule.h

ZCOMT-2570 : Examine src/mail/ngx_mail_pop3_module.c of the public ng…

5d43868

…inx repository and merge them with the Zimbra files. - src/mail/ngx_mail_pop3_module.c has been merged from branches/stable 1.24 to the current zimbra/nginx.

ZCOMT-2579: Discuss the review comment and apply it to the "core" dir…

8343803

…ectory. - Review comments are discussed with barry and applied them

ZCOMT-2578: Merge the files in the "mail" directory from the public n…

19b5a4e

…ginx repository. - Merged the files with latest nginx version stable-1.24.0

ZCOMT-2579 :

c27c52b

- Remaining file

Merge pull request #6 from Zimbra/bugfix/ZCOMT-2579

fc2347c

ZCOMT-2579: Discuss the review comment and apply it to the "core" dir…

ZCOMT-2581 : Review and compile the merged nginx code

83615d4

- Some review changes

ZCOMT-2581 : Review and compile the merged nginx code

47314b2

- Some review changes

ZCOMT-2581 : Review and compile the merged nginx code

cd849b6

- Some review changes

ZCOMT-2586 - Compile the nginx code in branch feature/ZCS-11179

80ca9e1

- Fixed compilation errors

ZCOMT-2586 - Compile the nginx code in branch feature/ZCS-11179

c571aaa

- AMB : Code is commented in order to move compilation forward and detect any errors that arise. See https://trac.nginx.org/nginx/ticket/2312

SuryawanshiAmol and others added 2 commits October 2, 2023 16:37

ZCS-13998 : NGINX - Customization code separation from repo

d10bc53

- Removed the whitespaces

Update ngx_http_upstream.c

c518f04

fix code comment start->end

uttamtakalkar requested review from desouzas, k-kato and umagmrit October 6, 2023 09:02

ghost mentioned this pull request Oct 6, 2023

Feature/zcs 11179 Zimbra/packages#194

Merged

SuryawanshiAmol added 2 commits October 9, 2023 17:07

ZCS-13998 : NGINX - Customization code separation from repo

7b0bec7

- Updated as a part of code review

ZCS-13998 : NGINX - Customization code separation from repo

db58187

- Updated as a part of code review

ZCS-13998 : NGINX - Customization code separation from repo

554d6ed

- Updated as a part of code review

ghost approved these changes Oct 9, 2023

View reviewed changes

desouzas reviewed Oct 10, 2023

View reviewed changes

src/event/ngx_event_openssl.c Outdated Show resolved Hide resolved

src/mail/ngx_mail_parse.c Show resolved Hide resolved

src/mail/ngx_mail_parse.c Show resolved Hide resolved

RakeshAMore reviewed Oct 11, 2023

View reviewed changes

auto/configure Show resolved Hide resolved

auto/options Show resolved Hide resolved

ZCS-14068 : NGINX - Update review comments and documentation

1286d0e

- Updated as a part of code review

ghost requested a review from ashishkataria86 October 13, 2023 06:49

umagmrit merged commit cf37e06 into zimbra/develop Feb 7, 2024

umagmrit deleted the feature/ZCS-11179 branch February 7, 2024 05:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/zcs 11179#5

Feature/zcs 11179#5
umagmrit merged 28 commits intozimbra/developfrom
feature/ZCS-11179

SuryawanshiAmol commented Aug 10, 2023

Uh oh!

ghen2 commented Sep 19, 2023

Uh oh!

ghost commented Oct 2, 2023 •

edited by ghost

Loading

Uh oh!

SuryawanshiAmol commented Oct 6, 2023

Uh oh!

SuryawanshiAmol commented Oct 6, 2023

Uh oh!

ghost commented Oct 9, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ghen2 commented Oct 14, 2023

Uh oh!

ghen2 commented Oct 23, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

SuryawanshiAmol commented Aug 10, 2023

Uh oh!

ghen2 commented Sep 19, 2023

Uh oh!

ghost commented Oct 2, 2023 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SuryawanshiAmol commented Oct 6, 2023

Uh oh!

SuryawanshiAmol commented Oct 6, 2023

Uh oh!

ghost commented Oct 9, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ghen2 commented Oct 14, 2023

Uh oh!

ghen2 commented Oct 23, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ghost commented Oct 2, 2023 •

edited by ghost

Loading