Send Netdot-devel mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Netdot-devel digest..."
Today's Topics:
1. [Netdot - Bug #1683] (Resolved) Subnets not created on
initial device discovery from web UI ([email protected])
2. Re: keywords search case sensitivity (Karl Putland)
3. [Netdot - Bug #1673] (Resolved) Problem with permissions on
more specific Ipblocks ([email protected])
4. [SCM] UNNAMED PROJECT branch netdot-1.0 updated.
netdot-1.0.1-20-gf8f5d8d ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 30 Aug 2012 08:07:50 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1683] (Resolved) Subnets not
created on initial device discovery from web UI
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1683 has been updated by Carlos Vicente.
Status changed from New to Resolved
----------------------------------------
Bug #1683: Subnets not created on initial device discovery from web UI
https://osl.uoregon.edu/redmine/issues/1683#change-2955
Author: Carlos Vicente
Status: Resolved
Priority: High
Assignee: Carlos Vicente
Category: DeviceManagement
Target version: 1.0.2
Resolution: fixed
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 2
Date: Thu, 30 Aug 2012 09:15:19 -0600
From: Karl Putland <[email protected]>
Subject: Re: [Netdot-devel] keywords search case sensitivity
To: Carlos Vicente <[email protected]>
Cc: [email protected]
Message-ID:
<CA+EXWsyREtK=6y_odktew_mjq4jc3fdz7n0dzfdzvwonqgg...@mail.gmail.com>
Content-Type: text/plain; charset="iso-8859-1"
Thanks!
--Karl
One number: 303.242.8608
Sent from a mobile device
On Aug 30, 2012 9:07 AM, "Carlos Vicente" <[email protected]> wrote:
> Thanks,
>
> I have applied the patch, but only for Pg, as MySQL's default collation
> is case insensitive.
>
> cv
>
> On 8/29/12 3:48 PM, Karl Putland wrote:
> > Make search_like case insensitive.
> > This improves usability for me and my users.
> >
> >
> > diff -u Netdot.orig/Model.pm Netdot/Model.pm
> > --- Netdot.orig/Model.pm2012-08-29 19:31:39.323838352 +0000
> > +++ Netdot/Model.pm2012-08-29 19:45:08.559831642 +0000
> > @@ -531,10 +531,10 @@
> > } else {
> > # Fix lack of typecast introduced in Pg 8.x
> > if (Netdot->config->get('DB_TYPE') eq "Pg") {
> > - push @qual, "CAST($column AS text) LIKE ?";
> > + push @qual, "UPPER(CAST($column AS text)) LIKE
> > UPPER(?)";
> > push @bind, $value;
> > } else {
> > - push @qual, "$column LIKE ?";
> > + push @qual, "UPPER($column) LIKE UPPER(?)";
> > push @bind, $value;
> > }
> > }
> >
> > --Karl
> >
> > Karl Putland
> > Senior VoIP Engineer
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
http://osl.uoregon.edu/pipermail/netdot-devel/attachments/20120830/ef4a1a84/attachment-0001.html
------------------------------
Message: 3
Date: Thu, 30 Aug 2012 08:38:18 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1673] (Resolved) Problem with
permissions on more specific Ipblocks
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1673 has been updated by Carlos Vicente.
Status changed from New to Resolved
Assignee set to Carlos Vicente
Resolution set to fixed
----------------------------------------
Bug #1673: Problem with permissions on more specific Ipblocks
https://osl.uoregon.edu/redmine/issues/1673#change-2956
Author: Carlos Vicente
Status: Resolved
Priority: High
Assignee: Carlos Vicente
Category: IPManagement
Target version: 1.0.2
Resolution: fixed
A user gets assigned permissions to edit 192.168.0.0/16, but also to
'choose_ip' on 192.168.64.0/24. In this case, Netdot fails to traverse the
hierarchy upward to detect that it can edit the more specific block.
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 4
Date: Thu, 30 Aug 2012 08:45:56 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] UNNAMED PROJECT branch netdot-1.0
updated. netdot-1.0.1-20-gf8f5d8d
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, netdot-1.0 has been updated
via f8f5d8d11c616d63da1dc839f74f444ca658be54 (commit)
via bfeb8535177008a142598d3da064667f0ab0f89f (commit)
via 2df37c82f01c656b2d917d32b517f8d93eea5a33 (commit)
via ee07498c519404257ad874334ec2dece69daf4e4 (commit)
from 599ddac8f21a44b33e8e042a6c513a658f16b26d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f8f5d8d11c616d63da1dc839f74f444ca658be54
Author: Carlos Vicente <[email protected]>
Date: Thu Aug 30 11:46:01 2012 -0400
Existing but available addresses not offered to regular user in manual
select option
diff --git a/htdocs/management/subnet.mhtml b/htdocs/management/subnet.mhtml
index 9806ed1..b4782a7 100644
--- a/htdocs/management/subnet.mhtml
+++ b/htdocs/management/subnet.mhtml
@@ -29,7 +29,7 @@ my $make_cell = sub {
my $str = $disp_addr;
if ( $caller eq 'choose_ip.html' ){
# Called as a popup window
- unless ( $used ){
+ if (!$used || ($used && $divclass eq 'ipaddr_available') ){
if ( ($priv_user && $can_edit) || $can_choose ){
$str = sprintf('<a href="#"
onClick="selectAddr(\'%s\')">%s</a>',
$addr, $disp_addr);
commit bfeb8535177008a142598d3da064667f0ab0f89f
Author: Carlos Vicente <[email protected]>
Date: Thu Aug 30 11:38:22 2012 -0400
Fix for #1673 (Problem with permissions on more specific Ipblocks)
diff --git a/lib/Netdot/ObjectAccessRule.pm b/lib/Netdot/ObjectAccessRule.pm
index b180b5e..634f4f9 100644
--- a/lib/Netdot/ObjectAccessRule.pm
+++ b/lib/Netdot/ObjectAccessRule.pm
@@ -60,6 +60,9 @@ sub denies(){
"denied to $username ($user_type)");
return 1;
}
+ if ( $otype eq 'Ipblock' ){
+ return &_deny_ip_access($action, $access, $object);
+ }
}
return &_deny_action_access($action, $access->{$otype}->{$oid});
@@ -276,20 +279,26 @@ sub _deny_ip_access {
return 1;
}
}
+
# Deny unless there's an ancestor which is permitted. This includes
# subnets, containers, etc.
my $deny = 1;
+
+ # Start with the given object
+ $deny = &_deny_action_access($action,
$access->{'Ipblock'}->{$ipblock->id});
+ return $deny if $deny == 0;
+
+ # Then check its ancestors recursively
foreach my $ancestor ( $ipblock->get_ancestors ){
if ( exists $access->{'Ipblock'}->{$ancestor->id} ){
$deny = &_deny_action_access($action,
$access->{'Ipblock'}->{$ancestor->id});
- last if $deny == 0;
+ return $deny if $deny == 0;
}
}
- return $deny;
$logger->debug("ObjectAccessRule::_deny_ip_access: ".$ipblock->get_label
." not within allowed block. Denying access.");
- return 1;
+ return $deny;
}
commit 2df37c82f01c656b2d917d32b517f8d93eea5a33
Author: Carlos Vicente <[email protected]>
Date: Thu Aug 30 09:35:07 2012 -0400
Support case insensitive searches when using Pg
diff --git a/lib/Netdot/Model.pm b/lib/Netdot/Model.pm
index 930f7dc..ee74cd5 100644
--- a/lib/Netdot/Model.pm
+++ b/lib/Netdot/Model.pm
@@ -531,7 +531,7 @@ sub search_like {
} else {
# Fix lack of typecast introduced in Pg 8.x
if (Netdot->config->get('DB_TYPE') eq "Pg") {
- push @qual, "CAST($column AS text) LIKE ?";
+ push @qual, "UPPER(CAST($column AS text)) LIKE UPPER(?)";
push @bind, $value;
} else {
push @qual, "$column LIKE ?";
commit ee07498c519404257ad874334ec2dece69daf4e4
Author: Carlos Vicente <[email protected]>
Date: Thu Aug 30 09:34:39 2012 -0400
Updated manual to include PTR in list of supported DNS records
diff --git a/doc/manual/netdot-manual-es.txt b/doc/manual/netdot-manual-es.txt
index d364dd7..3fbe07b 100644
--- a/doc/manual/netdot-manual-es.txt
+++ b/doc/manual/netdot-manual-es.txt
@@ -831,7 +831,7 @@ ejecutar chequeos de sintaxis y cargarlos en los servidores
DNS
apropiados.
Netdot soporta los siguientes registros DNS: A, AAAA, CNAME, DS, HINFO,
-LOC, MX, NAPTR, SRV, y TXT.
+LOC, MX, NAPTR, PTR, SRV, y TXT.
Se pueden importar los ficheros de zona existentes hacia Netdot con la
ayuda de la herramienta `import_bind_zones.pl` que está en la carpeta
diff --git a/doc/manual/netdot-manual.txt b/doc/manual/netdot-manual.txt
index 07536e0..5ea254f 100644
--- a/doc/manual/netdot-manual.txt
+++ b/doc/manual/netdot-manual.txt
@@ -794,7 +794,7 @@ then be used by system configuration engines like Puppet or
CfEngine to
run syntax checks and load them into the appropriate name servers.
Netdot supports the following DNS records: A, AAAA, CNAME, DS, HINFO,
-LOC, MX, NAPTR, SRV, and TXT.
+LOC, MX, NAPTR, PTR, SRV, and TXT.
You can import your existing BIND zones into netdot with the help of the
tool `import_bind_zones.pl` from the import subdirectory
-----------------------------------------------------------------------
Summary of changes:
doc/manual/netdot-manual-es.txt | 2 +-
doc/manual/netdot-manual.txt | 2 +-
htdocs/management/subnet.mhtml | 2 +-
lib/Netdot/Model.pm | 2 +-
lib/Netdot/ObjectAccessRule.pm | 15 ++++++++++++---
5 files changed, 16 insertions(+), 7 deletions(-)
hooks/post-receive
--
UNNAMED PROJECT
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 65, Issue 24
********************************************
