File tree Expand file tree Collapse file tree 1 file changed +10
-20
lines changed
blog/26-02-05/request-url-to-absolute-filename/ex Expand file tree Collapse file tree 1 file changed +10
-20
lines changed Original file line number Diff line number Diff line change 66
77 resolve . df = false ;
88
9- async function resolve ( url , docroot = '.' ) {
9+ function resolve ( url , docroot = '.' ) {
1010 resolve . df && console . log ( '=== resolve v2.0 ===' ) ;
1111 resolve . df && console . log ( 'url :' , url ) ;
1212 resolve . df && console . log ( 'docroot :' , docroot ) ;
3333 root += path . sep ;
3434 resolve . df && console . log ( 'root :' , root ) ;
3535 var abs = path . resolve ( docroot , url ) ;
36- var err ;
37- try {
38-
39- var stat = await fs . promises . stat ( abs ) ;
40-
41- } //try
42- catch ( err2 ) {
43-
44- err = err2 ;
45-
46- } //catch
47- if ( err ) {
48- var error = err . toString ( ) ;
49- return { error}
50- }
51- if ( stat . isDirectory ( ) ) {
52- abs += path . sep ;
53- }
5436 resolve . df && console . log ( 'abs :' , abs ) ;
5537
5638 if ( ! abs . startsWith ( root ) ) {
57- resolve . df && console . log ( 'fail ' ) ;
39+ resolve . df && console . log ( 'not docroot ' ) ;
5840 var error = 'resolve' ;
5941 return { error} ;
6042 }
6143
44+ if ( abs . length > root . length ) {
45+ if ( abs [ root . length ] != path . sep ) {
46+ resolve . df && console . log ( 'not docroot2' ) ;
47+ var error = 'not docroot2' ;
48+ return { error} ;
49+ }
50+ }
51+
6252 resolve . df && console . log ( 'ok' , abs ) ;
6353 return { abs} ;
6454
You can’t perform that action at this time.
0 commit comments