|
9 | 9 |
|
10 | 10 | function resolve(requrl,docroot='.'){ |
11 | 11 | resolve.df && console.log('=== resolve v2.0 ==='); |
12 | | - resolve.df && console.log('requrl : ',requrl); |
13 | | - resolve.df && console.log('docroot : ',docroot); |
| 12 | + resolve.df && console.log('requrl : ',requrl); |
| 13 | + resolve.df && console.log('docroot : ',docroot); |
14 | 14 | var err; |
15 | 15 | try{ |
16 | 16 |
|
|
23 | 23 |
|
24 | 24 | }//catch |
25 | 25 | if(err){ |
26 | | - resolve.df && console.log('error : ',err.message); |
| 26 | + resolve.df && console.log('error : ',err.message); |
27 | 27 | var error = 'invalid url'; |
28 | 28 | return {error}; |
29 | 29 | } |
30 | 30 |
|
31 | 31 | var url = requrl; |
32 | 32 |
|
33 | 33 | if(url.indexOf('\\')!=-1){ |
34 | | - resolve.df && console.log('error : ','invalid url ( backslash )'); |
| 34 | + resolve.df && console.log('error : ','invalid url ( backslash )'); |
35 | 35 | var error = 'invalid url ( backslash )'; |
36 | 36 | return {error}; |
37 | 37 | } |
38 | 38 |
|
39 | 39 | url = url.slice(1); |
40 | | - resolve.df && console.log('url :',url); |
| 40 | + resolve.df && console.log('url :',url); |
41 | 41 | var root = path.resolve(docroot); |
42 | 42 | //root += path.sep; |
43 | | - resolve.df && console.log('root :',root); |
| 43 | + resolve.df && console.log('root :',root); |
44 | 44 | var abs = path.resolve(docroot,url); |
45 | | - resolve.df && console.log('abs :',abs); |
| 45 | + resolve.df && console.log('abs :',abs); |
46 | 46 |
|
47 | 47 | if(!abs.startsWith(root)){ |
48 | | - resolve.df && console.log('error : ','invalid docroot'); |
| 48 | + resolve.df && console.log('error : ','invalid docroot'); |
49 | 49 | var error = 'invalid docroot'; |
50 | 50 | return {error}; |
51 | 51 | } |
52 | 52 |
|
53 | 53 | if(abs.length>root.length){ |
54 | 54 | if(abs[root.length]!=path.sep){ |
55 | | - resolve.df && console.log('error : ','invlaid docroot-2'); |
| 55 | + resolve.df && console.log('error : ','invlaid docroot-2'); |
56 | 56 | var error = 'invalid docroot-2'; |
57 | 57 | return {error}; |
58 | 58 | } |
|
63 | 63 | } |
64 | 64 |
|
65 | 65 |
|
66 | | - resolve.df && console.log('ok : ',abs); |
| 66 | + resolve.df && console.log('ok : ',abs); |
67 | 67 | return {abs}; |
68 | 68 |
|
69 | 69 | }//resolve |
|
0 commit comments