Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[17.0][IMP] mail_environment: ssl certificate auth #196

Open
wants to merge 2 commits into
base: 17.0
Choose a base branch
from
Open

[17.0][IMP] mail_environment: ssl certificate auth #196

wants to merge 2 commits into from

Conversation

grindtildeath
Copy link
Contributor

@gurneyalex @grindtildeath
[IMP] mail_environment: ssl certificate auth
8233ad2 
Add support to configure outgoing mail server to use SSL certificate
authentication through mail environment.
@gurneyalex @grindtildeath
[FIX] mail_environment: default computation
ea72167 
fix the implementation of _compute_default_authentication
to match what is expected by the mixin
@gurneyalex
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 17.0-ocabot-merge-pr-196-by-gurneyalex-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 28, 2024
@OCA-git-bot
Merge PR #196 into 17.0
a7f010d 
Signed-off-by gurneyalex
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 17.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 17.0-ocabot-merge-pr-196-by-gurneyalex-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 28, 2024
@OCA-git-bot
Merge PR #196 into 17.0
cb72625 
Signed-off-by gurneyalex
@OCA-git-bot
Copy link
Contributor

@gurneyalex The merge process could not be finalized, because command oca-gen-addon-readme --if-source-changed --org-name OCA --repo-name server-env --branch 17.0 --addons-dir /tmp/tmpricx8mbf --commit failed with output:

/tmp/tmpricx8mbf/mail_environment/README.rst:96: (WARNING/2) Literal block expected; none found.
Traceback (most recent call last):
  File "/ocamt/lib/python3.8/site-packages/docutils/statemachine.py", line 233, in run
    context, next_state, result = self.check_line(
  File "/ocamt/lib/python3.8/site-packages/docutils/statemachine.py", line 445, in check_line
    return method(match, context, next_state)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 3129, in text
    raise EOFError
EOFError

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/usr/local/bin/oca-gen-addon-readme", line 11, in <module>
    load_entry_point('oca-maintainers-tools', 'console_scripts', 'oca-gen-addon-readme')()
  File "/ocamt/lib/python3.8/site-packages/click/core.py", line 1157, in __call__
    return self.main(*args, **kwargs)
  File "/ocamt/lib/python3.8/site-packages/click/core.py", line 1078, in main
    rv = self.invoke(ctx)
  File "/ocamt/lib/python3.8/site-packages/click/core.py", line 1434, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/ocamt/lib/python3.8/site-packages/click/core.py", line 783, in invoke
    return __callback(*args, **kwargs)
  File "/ocamt/src/oca-maintainers-tools/tools/gen_addon_readme.py", line 575, in gen_addon_readme
    check_rst(readme_filename)
  File "/ocamt/src/oca-maintainers-tools/tools/gen_addon_readme.py", line 398, in check_rst
    publish_file(
  File "/ocamt/lib/python3.8/site-packages/docutils/core.py", line 422, in publish_file
    output, publisher = publish_programmatically(
  File "/ocamt/lib/python3.8/site-packages/docutils/core.py", line 722, in publish_programmatically
    output = publisher.publish(enable_exit_status=enable_exit_status)
  File "/ocamt/lib/python3.8/site-packages/docutils/core.py", line 234, in publish
    self.document = self.reader.read(self.source, self.parser,
  File "/ocamt/lib/python3.8/site-packages/docutils/readers/__init__.py", line 70, in read
    self.parse()
  File "/ocamt/lib/python3.8/site-packages/docutils/readers/__init__.py", line 76, in parse
    self.parser.parse(self.input, document)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/__init__.py", line 184, in parse
    self.statemachine.run(inputlines, document, inliner=self.inliner)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 169, in run
    results = StateMachineWS.run(self, input_lines, input_offset,
  File "/ocamt/lib/python3.8/site-packages/docutils/statemachine.py", line 233, in run
    context, next_state, result = self.check_line(
  File "/ocamt/lib/python3.8/site-packages/docutils/statemachine.py", line 445, in check_line
    return method(match, context, next_state)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 3024, in text
    self.section(title.lstrip(), source, style, lineno + 1, messages)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 325, in section
    self.new_subsection(title, lineno, messages)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 391, in new_subsection
    newabsoffset = self.nested_parse(
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 279, in nested_parse
    state_machine.run(block, input_offset, memo=self.memo,
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 195, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/ocamt/lib/python3.8/site-packages/docutils/statemachine.py", line 233, in run
    context, next_state, result = self.check_line(
  File "/ocamt/lib/python3.8/site-packages/docutils/statemachine.py", line 445, in check_line
    return method(match, context, next_state)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 2785, in underline
    self.section(title, source, style, lineno - 1, messages)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 325, in section
    self.new_subsection(title, lineno, messages)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 391, in new_subsection
    newabsoffset = self.nested_parse(
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 279, in nested_parse
    state_machine.run(block, input_offset, memo=self.memo,
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 195, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/ocamt/lib/python3.8/site-packages/docutils/statemachine.py", line 233, in run
    context, next_state, result = self.check_line(
  File "/ocamt/lib/python3.8/site-packages/docutils/statemachine.py", line 445, in check_line
    return method(match, context, next_state)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 2807, in text
    self.parent += self.literal_block()
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 2817, in literal_block
    return self.quoted_literal_block()
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 2831, in quoted_literal_block
    new_abs_offset = self.nested_parse(
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 279, in nested_parse
    state_machine.run(block, input_offset, memo=self.memo,
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 195, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/ocamt/lib/python3.8/site-packages/docutils/statemachine.py", line 239, in run
    result = state.eof(context)
  File "/ocamt/lib/python3.8/site-packages/docutils/parsers/rst/states.py", line 3090, in eof
    self.parent += self.reporter.warning(
  File "/ocamt/lib/python3.8/site-packages/docutils/utils/__init__.py", line 224, in warning
    return self.system_message(self.WARNING_LEVEL, *args, **kwargs)
  File "/ocamt/lib/python3.8/site-packages/docutils/utils/__init__.py", line 197, in system_message
    raise SystemMessage(msg, level)
docutils.utils.SystemMessage: /tmp/tmpricx8mbf/mail_environment/README.rst:96: (WARNING/2) Literal block expected; none found.

hparfr
hparfr approved these changes Oct 24, 2024
View reviewed changes
mail_environment/readme/CONFIGURE.md
you need to set the following entries in the configuration entry ::

smtp_authentication = certificate
smtp_ssl_certificate = <base64 encoded certificate>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this syntax generating the failure in the merge ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hparfr hparfr hparfr approved these changes

@gurneyalex gurneyalex gurneyalex approved these changes

Assignees
No one assigned
Labels
approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@grindtildeath @gurneyalex @OCA-git-bot @hparfr