Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
c30fc43f
Commit
c30fc43f
authored
Oct 21, 2014
by
Frédéric Buclin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 1083737: Validate the smtpserver parameter
r=dkl a=glob
parent
2ebb8b6a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
2 deletions
+32
-2
Common.pm
Bugzilla/Config/Common.pm
+30
-1
MTA.pm
Bugzilla/Config/MTA.pm
+2
-1
No files found.
Bugzilla/Config/Common.pm
View file @
c30fc43f
...
...
@@ -29,7 +29,7 @@ use parent qw(Exporter);
check_mail_delivery_method check_notification check_utf8
check_bug_status check_smtp_auth check_theschwartz_available
check_maxattachmentsize check_email check_smtp_ssl
check_comment_taggers_group
check_comment_taggers_group
check_smtp_server
)
;
# Checking functions for the various values
...
...
@@ -342,6 +342,33 @@ sub check_notification {
return
""
;
}
sub
check_smtp_server
{
my
$host
=
shift
;
my
$port
;
if
(
$host
=~
/:/
)
{
(
$host
,
$port
)
=
split
(
/:/
,
$host
,
2
);
unless
(
$port
&&
detaint_natural
(
$port
))
{
return
"Invalid port. It must be an integer (typically 25, 465 or 587)"
;
}
}
trick_taint
(
$host
);
# Let's first try to connect using SSL. If this fails, we fall back to
# an unencrypted connection.
foreach
my
$method
([
'Net::SMTP::SSL'
,
465
],
[
'Net::SMTP'
,
25
])
{
my
(
$class
,
$default_port
)
=
@$method
;
next
if
$class
eq
'Net::SMTP::SSL'
&&
!
Bugzilla
->
feature
(
'smtp_ssl'
);
eval
"require $class"
;
my
$smtp
=
$class
->
new
(
$host
,
Port
=>
$port
||
$default_port
,
Timeout
=>
5
);
if
(
$smtp
)
{
# The connection works!
$smtp
->
quit
;
return
''
;
}
}
return
"Cannot connect to $host"
.
(
$port
?
" using port $port"
:
""
);
}
sub
check_smtp_auth
{
my
$username
=
shift
;
if
(
$username
and
!
Bugzilla
->
feature
(
'smtp_auth'
))
{
...
...
@@ -498,6 +525,8 @@ valid group is provided.
=item check_shadowdb
=item check_smtp_server
=item check_smtp_auth
=item check_url
...
...
Bugzilla/Config/MTA.pm
View file @
c30fc43f
...
...
@@ -42,7 +42,8 @@ sub get_param_list {
{
name
=>
'smtpserver'
,
type
=>
't'
,
default
=>
'localhost'
default
=>
'localhost'
,
checker
=>
\&
check_smtp_server
},
{
name
=>
'smtp_username'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment