Merge pull request #243 from IBM/subnet_filter

Filter subnets when listing subnets, creating instance and ocp
IBM · Jan 18, 2021 · 5b4b60c · 5b4b60c
2 parents 93dcb11 + 6ee3500
commit 5b4b60c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 51 deletions.
diff --git a/web/clui/routes/instance.go b/web/clui/routes/instance.go
@@ -943,7 +943,8 @@ func (v *InstanceView) New(c *macaron.Context, store session.Store) {
 		return
 	}
 	ctx := c.Req.Context()
-	_, subnets, err := subnetAdmin.List(ctx, 0, -1, "", "", "")
+	sql := fmt.Sprintf("type = 'public' or owner = %d", memberShip.OrgID)
+	_, subnets, err := subnetAdmin.List(ctx, 0, -1, "", "", sql)
 	if err != nil {
 		c.Data["ErrorMsg"] = err.Error()
 		c.HTML(500, "500")
@@ -1272,13 +1273,6 @@ func (v *InstanceView) Create(c *macaron.Context, store session.Store) {
 		c.HTML(http.StatusBadRequest, "error")
 		return
 	}
-	permit, err = memberShip.CheckAdmin(model.Writer, "subnets", int64(primaryID))
-	if !permit {
-		log.Println("Not authorized to access subnet")
-		c.Data["ErrorMsg"] = "Need Write permissions"
-		c.HTML(http.StatusBadRequest, "error")
-		return
-	}
 	primaryIP := c.QueryTrim("primaryip")
 	ipAddr := strings.Split(primaryIP, "/")[0]
 	primaryMac := c.QueryTrim("primarymac")

diff --git a/web/clui/routes/openshift.go b/web/clui/routes/openshift.go
@@ -621,7 +621,8 @@ func (v *OpenshiftView) New(c *macaron.Context, store session.Store) {
 		c.HTML(500, "500")
 		return
 	}
-	_, subnets, err := subnetAdmin.List(ctx, 0, -1, "", "", "")
+	sql := fmt.Sprintf("type = 'public' or owner = %d", memberShip.OrgID)
+	_, subnets, err := subnetAdmin.List(ctx, 0, -1, "", "", sql)
 	if err != nil {
 		c.Data["ErrorMsg"] = err.Error()
 		c.HTML(500, "500")

diff --git a/web/clui/routes/subnet.go b/web/clui/routes/subnet.go
@@ -496,7 +496,7 @@ func (a *SubnetAdmin) List(ctx context.Context, offset, limit int64, order, quer
 	where := ""
 	wm := memberShip.GetWhere()
 	if wm != "" {
-		where = fmt.Sprintf("type != 'internal' or %s", wm)
+		where = fmt.Sprintf("type = 'public' or %s", wm)
 	}
 	subnets = []*model.Subnet{}
 	if err = db.Model(&model.Subnet{}).Where(where).Where(query).Where(sql).Count(&total).Error; err != nil {
@@ -557,6 +557,7 @@ func (v *SubnetView) List(c *macaron.Context, store session.Store) {
 	c.Data["Total"] = total
 	c.Data["Pages"] = pages
 	c.Data["Query"] = query
+	c.Data["UserID"] = store.Get("uid").(int64)
 	if c.Req.Header.Get("X-Json-Format") == "yes" {
 		c.JSON(200, map[string]interface{}{
 			"subnets": subnets,

diff --git a/web/clui/templates/instances_new.tmpl b/web/clui/templates/instances_new.tmpl
@@ -177,8 +177,6 @@
 
                                       <div class="menu">
 
-                                        {{ if .IsAdmin }}
-
                                         {{ range .Subnets }}
 
                                         <div class="item" data-value={{.ID}} data-text={{.Name}}--{{.Network}}/{{.Netmask}}>
@@ -189,24 +187,6 @@
 
                                         {{ end }}
 
-                                        {{ else }}
-
-                                        {{ range .Subnets }}
-
-                                        {{ if eq .Type "internal" }}
-
-                                        <div class="item" data-value={{.ID}} data-text={{.Name}}--{{.Network}}/{{.Netmask}}>
-
-                                          {{.Name}}
-
-                                        </div>
-
-                                        {{ end }}
-
-                                        {{ end }}
-
-                                         {{ end }}
-
                                       </div>
 
                                     </div>
@@ -243,8 +223,6 @@
 
                                       <div class="menu">
 
-                                        {{ if .IsAdmin }}
-
                                         {{ range .Subnets }}
 
                                         <div class="item" data-value={{.ID}} data-text={{.Name}}--{{.Network}}/{{.Netmask}}>
@@ -255,24 +233,6 @@
 
                                         {{ end }}
 
-                                        {{ else }}
-
-                                        {{ range .Subnets }}
-
-                                        {{ if eq .Type "internal" }}
-
-                                        <div class="item" data-value={{.ID}} data-text={{.Name}}--{{.Network}}/{{.Netmask}}>
-
-                                          {{.Name}}
-
-                                        </div>
-
-                                        {{ end }}
-
-                                        {{ end }}
-
-                                         {{ end }}
-
                                       </div>
 
                                     </div>

diff --git a/web/clui/templates/subnets.tmpl b/web/clui/templates/subnets.tmpl
@@ -40,6 +40,7 @@
 	                        <tbody>
                                 {{ $Link := .Link }}
                                 {{ range .Subnets }}
+								{{ if or $.IsAdmin (eq $.UserID .Creater) }}
 		                        <tr>
 									{{ if $.IsAdmin }}
 			                        <td><a href="{{$Link}}/{{.ID}}">{{.ID}}</a></td>
@@ -65,7 +66,8 @@
 						{{ end }}
                                     <td><div class="delete-button" data-url="{{$Link}}/{{.ID}}" data-id="{{.ID}}"><i class="dark purple trash alternate outline icon"></i></div></td>
 		                        </tr>
-                                {{ end }}
+				{{ end }}
+				{{ end }}
 	                        </tbody>
                         </table>
 		            </div>