File tree 2 files changed +17
-5
lines changed
2 files changed +17
-5
lines changed Original file line number Diff line number Diff line change @@ -121,10 +121,18 @@ private function reduceDots($path)
121
121
unset($ parts [$ i ]);
122
122
continue ;
123
123
}
124
- if ($ i > 0 && $ parts [$ i ] === '.. ' && $ parts [$ i - $ parentOffset ] !== '.. ' ) {
125
- unset($ parts [$ i - $ parentOffset ]);
126
- unset($ parts [$ i ]);
127
- $ parentOffset += 2 ;
124
+
125
+ if ($ i > 0 && $ parts [$ i ] === '.. ' ) {
126
+ $ parent = $ i - $ parentOffset ;
127
+ //Make sure parent exists, if not, check the next parent etc
128
+ while ($ parent >= 0 && empty ($ parts [$ parent ])){
129
+ $ parent --;
130
+ }
131
+ //Confirm parent is valid
132
+ if (!empty ($ parts [$ parent ]) && $ parts [$ parent ] !== '.. ' ){
133
+ unset($ parts [$ parent ]);
134
+ unset($ parts [$ i ]);
135
+ }
128
136
}
129
137
}
130
138
return '/ ' .implode ('/ ' , $ parts );
Original file line number Diff line number Diff line change @@ -183,10 +183,14 @@ public function normalizeUriProvider()
183
183
'/var/www/api/schema/../../definitions.yaml ' ,
184
184
'file:///var/www/definitions.yaml ' ,
185
185
],
186
+ [
187
+ '/var/www/api/schema/./../data/./../definitions.yaml ' ,
188
+ 'file:///var/www/api/definitions.yaml ' ,
189
+ ],
186
190
[
187
191
'/var/www/api/schema/./../definitions.yaml ' ,
188
192
'file:///var/www/api/definitions.yaml ' ,
189
- ],
193
+ ],
190
194
[
191
195
'/var/www/api/../definitions.yaml#/components/Pet ' ,
192
196
'file:///var/www/definitions.yaml#/components/Pet ' ,
You can’t perform that action at this time.
0 commit comments