Remove cnameframe

Remove dependencies on the query parameter `cnameframe`, as it is no
longer used to trigger `c.cname` behavior or for url parsing with
frames.

Remove `UrlParser.cname_get`, `UrlParser.mk_cname()`,
`UrlParser.is_in_frame()`, and `UrlParser.put_in_frame()`.

Author: Florence Yeun

r2/r2/config/middleware.py

@@ -107,8 +107,6 @@ def error_mapper(code, message, environ, global_conf=None, **kw):
             if error_data:
                 environ['extra_error_data'] = error_data
 
-        if environ.get('REDDIT_CNAME'):
-            d['cnameframe'] = 1
         if environ.get('REDDIT_NAME'):
             d['srname'] = environ.get('REDDIT_NAME')
         if environ.get('REDDIT_TAKEDOWN'):

r2/r2/controllers/front.py

@@ -1361,8 +1361,6 @@ def GET_framebuster(self, what=None, blah=None):
             if c.user_is_loggedin:
                 path += "login/"
             u = UrlParser(path + str(random.random()))
-            u.mk_cname(require_frame=False, subreddit=c.site,
-                       port=request.port)
             return self.redirect(u.unparse())
         # the user is not logged in or there is no cname.
         return FrameBuster(login=False).render()

r2/r2/lib/base.py

@@ -195,10 +195,6 @@ def format_output_url(cls, url, **kw):
             if not kw.has_key('port'):
                 kw['port'] = request.port
 
-            # disentangle the cname (for urls that would have
-            # cnameframe=1 in them)
-            u.mk_cname(**kw)
-
             # make sure the extensions agree with the current page
             if preserve_extension and c.extension:
                 u.set_extension(c.extension)

r2/r2/lib/pages/pages.py

@@ -4247,7 +4247,6 @@ def __init__(self, original_path, subreddit, sub_domain):
             u = UrlParser(subreddit.path + original_path)
             u.hostname = get_domain(cname = False, subreddit = False)
             u.update_query(**request.GET.copy())
-            u.put_in_frame()
             self.frame_target = u.unparse()
         else:
             self.title = ""

r2/r2/lib/utils/utils.py

@@ -479,16 +479,14 @@ class UrlParser(object):
     path can also be set and queried.
 
     The class also contains reddit-specific functions for setting,
-    checking, and getting a path's subreddit.  It also can convert
-    paths between in-frame and out of frame cname'd forms.
+    checking, and getting a path's subreddit.
     """
 
     __slots__ = ['scheme', 'path', 'params', 'query',
                  'fragment', 'username', 'password', 'hostname', 'port',
                  '_orig_url', '_orig_netloc', '_query_dict']
 
     valid_schemes = ('http', 'https', 'ftp', 'mailto')
-    cname_get = "cnameframe"
 
     def __init__(self, url):
         u = urlparse(url)
@@ -781,51 +779,6 @@ def netloc(self):
             return self.hostname + ":" + str(self.port)
         return self.hostname
 
-    def mk_cname(self, require_frame = True, subreddit = None, port = None):
-        """
-        Converts a ?cnameframe url into the corresponding cnamed
-        domain if applicable.  Useful for frame-busting on redirect.
-        """
-
-        # make sure the url is indeed in a frame
-        if require_frame and not self.query_dict.has_key(self.cname_get):
-            return self
-
-        # fetch the subreddit and make sure it
-        subreddit = subreddit or self.get_subreddit()
-        if subreddit and subreddit.domain:
-
-            # no guarantee there was a scheme
-            self.scheme = self.scheme or "http"
-
-            # update the domain (preserving the port)
-            self.hostname = subreddit.domain
-            self.port = getattr(self, 'port', None) or port
-
-            # and remove any cnameframe GET parameters
-            if self.query_dict.has_key(self.cname_get):
-                del self._query_dict[self.cname_get]
-
-            # remove the subreddit reference
-            self.path = lstrips(self.path, subreddit.path)
-            if not self.path.startswith('/'):
-                self.path = '/' + self.path
-
-        return self
-
-    def is_in_frame(self):
-        """
-        Checks if the url is in a frame by determining if
-        cls.cname_get is present.
-        """
-        return self.query_dict.has_key(self.cname_get)
-
-    def put_in_frame(self):
-        """
-        Adds the cls.cname_get get parameter to the query string.
-        """
-        self.update_query(**{self.cname_get:random.random()})
-
     def __repr__(self):
         return "<URL %s>" % repr(self.unparse())