Commit8f190b2

authored

fix: disallow out of range ports (#12414)

1 parent3a86ae5 commit8f190b2Copy full SHA for 8f190b2

File tree

+35

-2

lines changed

+35

-2

lines changed

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,25 @@ func (api API) postWorkspaceAgentPortShare(rw http.ResponseWriter, r http.Requ`
`33`	`33`	`if!req.ShareLevel.ValidPortShareLevel() {`
`34`	`34`	`httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`
`35`	`35`	`Message:"Port sharing level not allowed.",`
	`36`	`+Validations: []codersdk.ValidationError{`
	`37`	`+{`
	`38`	`+Field:"share_level",`
	`39`	`+Detail:"Port sharing level not allowed.",`
	`40`	`+},`
	`41`	`+},`
	`42`	`+})`
	`43`	`+return`
	`44`	`+}`
	`45`	`+`
	`46`	`+ifreq.Port<9\|\|req.Port>65535 {`
	`47`	`+httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`
	`48`	`+Message:"Port must be between 9 and 65535.",`
	`49`	`+Validations: []codersdk.ValidationError{`
	`50`	`+{`
	`51`	`+Field:"port",`
	`52`	`+Detail:"Port must be between 9 and 65535.",`
	`53`	`+},`
	`54`	`+},`
`36`	`55`	`})`
`37`	`56`	`return`
`38`	`57`	`}`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,20 @@ func TestPostWorkspaceAgentPortShare(t *testing.T) {`
`54`	`54`	`})`
`55`	`55`	`require.Error(t,err)`
`56`	`56`
	`57`	`+// invalid port should fail`
	`58`	`+_,err=client.UpsertWorkspaceAgentPortShare(ctx,r.Workspace.ID, codersdk.UpsertWorkspaceAgentPortShareRequest{`
	`59`	`+AgentName:agents[0].Name,`
	`60`	`+Port:0,`
	`61`	`+ShareLevel:codersdk.WorkspaceAgentPortShareLevelPublic,`
	`62`	`+})`
	`63`	`+require.Error(t,err)`
	`64`	`+_,err=client.UpsertWorkspaceAgentPortShare(ctx,r.Workspace.ID, codersdk.UpsertWorkspaceAgentPortShareRequest{`
	`65`	`+AgentName:agents[0].Name,`
	`66`	`+Port:90000000,`
	`67`	`+ShareLevel:codersdk.WorkspaceAgentPortShareLevelPublic,`
	`68`	`+})`
	`69`	`+require.Error(t,err)`
	`70`	`+`
`57`	`71`	`// OK, ignoring template max port share level because we are AGPL`
`58`	`72`	`ps,err:=client.UpsertWorkspaceAgentPortShare(ctx,r.Workspace.ID, codersdk.UpsertWorkspaceAgentPortShareRequest{`
`59`	`73`	`AgentName:agents[0].Name,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ export const PortForwardButton: FC<PortForwardButtonProps> = (props) => {`
`109`	`109`
`110`	`110`	`constgetValidationSchema=():Yup.AnyObjectSchema=>`
`111`	`111`	`Yup.object({`
`112`		`-port:Yup.number().required().min(0).max(65535),`
	`112`	`+port:Yup.number().required().min(9).max(65535),`
`113`	`113`	`share_level:Yup.string().required().oneOf(WorkspaceAppSharingLevels),`
`114`	`114`	`});`
`115`	`115`
`@@ -245,7 +245,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({`
`245`	`245`	`name="portNumber"`
`246`	`246`	`type="number"`
`247`	`247`	`placeholder="Connect to port..."`
`248`		`-min={0}`
	`248`	`+min={9}`
`249`	`249`	`max={65535}`
`250`	`250`	`required`
`251`	`251`	`css={styles.newPortInput}`

Comments

(0)